CLDR-18464 Add a Before Hijrah era to the Islamic calendars #4581

sffc · 2025-04-07T20:41:24Z

This PR completes the ticket.

ALLOW_MANY_COMMITS=true

sffc · 2025-04-07T20:42:37Z

common/supplemental/supplementalData.xml

        <calendar type="islamic">
          <calendarSystem type="lunar" />
          <eras>
+              <era type="-1" end="622-7-14" code="islamic-inverse" aliases="bh"/>


I gave it the code "islamic-inverse" because I want to land the code updates, #4519, atomically once we have agreement on them.

sffc · 2025-04-07T20:44:13Z

common/supplemental/supplementalData.xml

        <calendar type="islamic-civil">
          <calendarSystem type="lunar" />
          <eras>
+              <era type="-1" end="622-7-15" code="islamic-civil-inverse" aliases="bh"/>


I gave it the type -1 because type 0 is already used for the AH era. Please let me know if I should instead:

Use a positive number like 1 (and leave AH as 0)

Change BH to 0, AH to 1, and update all the XML files that currently have translations for AH at type 0 to instead be at type 1

@sffc Usually this number is used as an array index in ICU. I guess I would be in favor of your option #2 above. We would need to add a migration note for ICU (and for CLDR), and probably update some ICU code. I think we allow years to be negative, but I do not think we allow eras to be.

roozbehp

Generally looks good to me. I would also prefer the "Change BH to 0, AH to 1" option, as it seems cleanest.

sffc · 2025-04-10T22:39:21Z

This means changing all the XML files, which I'm willing to do and can probably automate, but to make sure, before I proceed, is it sufficient for me to change something like

					<eraAbbr>
						<era type="0">যুগ</era>
					</eraAbbr>

to

					<eraAbbr>
						<era type="1">যুগ</era>
					</eraAbbr>

without adding structure for type="0"? It will inherit automatically, right?

pedberg-icu · 2025-04-11T18:31:10Z

This means changing all the XML files, which I'm willing to do and can probably automate...It will inherit automatically, right?

As far as I know, yes.

sffc · 2025-04-11T21:07:49Z

Does this look right?

Here's how I generated the diff:

$ xmlstarlet ed --inplace -P -u "/ldml/dates/calendars/calendar[@type='islamic']/eras/*/era[@type=0]/@type" -v 1 *.xml

That updated all the XML files, but it also resulted in some other unwanted diffs to the XML. I undid those by manually touching up the diff file to remove diffs on lines containing &quot. I then went through the remaining changes and verified that they were touching only the era IDs.

To verify that I did everything, correct, I then ran:

$ xmlstarlet sel -t -v "/ldml/dates/calendars/calendar[@type='islamic']/eras/*/era[@type=0]" *.xml
Warning: program compiled against libxml 212 using older 209
Before Hijrah
BH
BH
$

So it found the three BH entries I put in and nothing else.

sffc · 2025-04-11T21:13:01Z

The other calendars don't have data. Only islamic.

$ xmlstarlet sel -t -v "/ldml/dates/calendars/calendar[@type='islamic-civil']/eras/*/era[@type=0]" *.xml
$ xmlstarlet sel -t -v "/ldml/dates/calendars/calendar[@type='islamic-rgsa']/eras/*/era[@type=0]" *.xml
$ xmlstarlet sel -t -v "/ldml/dates/calendars/calendar[@type='islamic-umalqura']/eras/*/era[@type=0]" *.xml
$ xmlstarlet sel -t -v "/ldml/dates/calendars/calendar[@type='islamic-tbla']/eras/*/era[@type=0]" *.xml
$

srl295

needs commit fix

sffc · 2025-04-16T05:21:26Z

@srl295, do you prefer me to merge the PR in this shape (AH becomes index 1, BH inserted at index 0) or would you prefer keeping AH at index 0 and adding BH at index 1 as @FrankYFTang suggested?

pedberg-icu · 2025-04-16T20:21:12Z

@srl295, do you prefer me to merge the PR in this shape (AH becomes index 1, BH inserted at index 0) or would you prefer keeping AH at index 0 and adding BH at index 1 as @FrankYFTang suggested?

@sffc I am not @srl295 but I now prefer keeping AH at index 0 and adding BH at index 1

sffc · 2025-04-17T01:00:50Z

OK please re-review.

srl295

The overall PR is straightforward to review now, with changes in other locales undone

srl295 · 2025-04-18T14:48:04Z

Do we need a followup issue to make sure CLDR spec clarifies this question so that it doesn't need to get discussed again? Variants and/or lack thereof?

See unicode-org#4581

jira-pull-request-webhook · 2025-04-18T16:57:13Z

Hooray! The files in the branch are the same across the force-push. 😃

~ Your Friendly Jira-GitHub PR Checker Bot

sffc · 2025-04-18T18:56:10Z

This is ready to merge; should I Squash And Merge or Rebase And Merge?

I'd like to use CLDR-18369 for all spec updates on this topic.

pedberg-icu · 2025-04-19T05:10:13Z

This is ready to merge; should I Squash And Merge or Rebase And Merge?

We usually Squash and merge except for special circumstances such as cherry-picking maint branch changes to main. But since this only has 1 commit does it make a difference? Does squash gives a different commit hash?

pedberg-icu · 2025-04-22T18:36:12Z

This causes an IndexOutOfBoundsException at org.unicode.cldr.test.ExampleGenerator.handleEras(ExampleGenerator.java:3158), because there is a reference to a hard-coded CALENDAR_ERAS HashMap maps "islamic" to a sample date for only a single era, need to add another entry for the new islamic era. I will make a PR to do that.

github-actions bot assigned sffc Apr 7, 2025

sffc commented Apr 7, 2025

View reviewed changes

sffc removed their assignment Apr 7, 2025

sffc requested a review from AEApple April 7, 2025 20:44

AEApple requested review from roozbehp, conradarcturus and pedberg-icu April 10, 2025 20:16

AEApple assigned sffc Apr 10, 2025

roozbehp reviewed Apr 10, 2025

View reviewed changes

sffc mentioned this pull request Apr 11, 2025

Formatting era index is really bad and will break in CLDR 48 unicode-org/icu4x#6444

Closed

AEApple requested a review from srl295 April 12, 2025 00:46

srl295 previously approved these changes Apr 15, 2025

View reviewed changes

srl295 self-requested a review April 16, 2025 21:23

sffc dismissed srl295’s stale review via 5d66c53 April 17, 2025 01:00

sffc mentioned this pull request Apr 17, 2025

CLDR-18465 Remove Before Diocletian era from Coptic calendar #4620

Merged

1 task

srl295 approved these changes Apr 18, 2025

View reviewed changes

CLDR-18464 Add a Before Hijrah era to the Islamic calendars

a1c629c

See unicode-org#4581

sffc force-pushed the CLDR-18464-bh branch from 5d66c53 to a1c629c Compare April 18, 2025 16:57

sffc merged commit 632c93a into unicode-org:main Apr 19, 2025
9 checks passed

sffc deleted the CLDR-18464-bh branch April 19, 2025 05:55

anba mentioned this pull request Jun 28, 2025

Update various era codes tc39/proposal-intl-era-monthcode#39

Merged

robertbastian mentioned this pull request Aug 11, 2025

CLDR-18369 Revise era codes to match Temporal specification #4519

Merged

1 task

CLDR-18464 Add a Before Hijrah era to the Islamic calendars #4581

CLDR-18464 Add a Before Hijrah era to the Islamic calendars #4581

Conversation

sffc commented Apr 7, 2025

Uh oh!

sffc Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

sffc Apr 7, 2025

Choose a reason for hiding this comment

Uh oh!

pedberg-icu Apr 10, 2025

Choose a reason for hiding this comment

Uh oh!

roozbehp left a comment

Choose a reason for hiding this comment

Uh oh!

sffc commented Apr 10, 2025

Uh oh!

pedberg-icu commented Apr 11, 2025

Uh oh!

sffc commented Apr 11, 2025

Uh oh!

sffc commented Apr 11, 2025

Uh oh!

srl295 left a comment

Choose a reason for hiding this comment

Uh oh!

sffc commented Apr 16, 2025

Uh oh!

pedberg-icu commented Apr 16, 2025

Uh oh!

sffc commented Apr 17, 2025

Uh oh!

srl295 left a comment

Choose a reason for hiding this comment

Uh oh!

srl295 commented Apr 18, 2025

Uh oh!

jira-pull-request-webhook bot commented Apr 18, 2025

Uh oh!

sffc commented Apr 18, 2025 • edited by atlassian bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

pedberg-icu commented Apr 19, 2025

Uh oh!

Uh oh!

pedberg-icu commented Apr 22, 2025

Uh oh!

Uh oh!

sffc commented Apr 18, 2025 •

edited by atlassian bot

Loading